Skip to content

FAL-2076 Cherry-picks #28066 into lilac.master - #28250

Merged
1 commit merged into
openedx:open-release/lilac.masterfrom
open-craft:lilac/feanil/arch-1821-alternative
Aug 4, 2021
Merged

FAL-2076 Cherry-picks #28066 into lilac.master#28250
1 commit merged into
openedx:open-release/lilac.masterfrom
open-craft:lilac/feanil/arch-1821-alternative

Conversation

@pomegranited

@pomegranited pomegranited commented Jul 22, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Cherry-picks https://github.com/edx/edx-platform/pull/28066 into open-release/lilac.master.

Testing instructions

(Ocim Admins only)

  1. Locate the Active running appserver for the Periodic build Lilac instance via Ocim
  2. Visit the Authenticated Link , and append /heartbeat?extended
  3. Ensure that the celery check is passing.

Deadline

None

Other information

  1. Ordinarily, we'd be able to view the https://periodic-build-lilac.opencraft.hosting/heartbeat?extended to verify that the heartbeat checks are succeeding.

    However, the forum extended check is also failing for lilac.master (and master), and so Ocim redirects to the standard error page instead of showing the healthcheck json. The forum failure will be addressed by https://github.com/edx/configuration/pull/6482.

Reviewer

@feanil @pomegranited
Merge pull request openedx#28066 from edx/feanil/arch-1821-alternative
ed9f6c4 
fix!: Make default queue names service variant specific.

(cherry picked from commit 4b29872)
@openedx-webhooks openedx-webhooks added needs triage open-source-contribution PR author is not from Axim or 2U labels Jul 22, 2021
@openedx-webhooks

openedx-webhooks commented Jul 22, 2021

Copy link
Copy Markdown

Thanks for the pull request, @pomegranited! I've created OSPR-5928 to keep track of it in JIRA, where we prioritize reviews. Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@natabene

natabene commented Jul 22, 2021

Copy link
Copy Markdown
Contributor

@pomegranited Thank you for your contribution, do you need an edX reviewer for this?

@openedx-webhooks openedx-webhooks added waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed needs triage labels Jul 23, 2021
@pomegranited

pomegranited commented Jul 23, 2021

Copy link
Copy Markdown
Contributor Author

@natabene Nope! @arbrandes can handle this as core committer to lilac.master :)

gabor-boros
gabor-boros approved these changes Jul 26, 2021
View reviewed changes

@gabor-boros gabor-boros left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 🎉

The check output was the following which is expected based on the description. It's approved from my side.

{
  "modulestore": {
    "status": true,
    "message": "OK"
  },
  "sql": {
    "status": true,
    "message": "OK"
  },
  "celery": {
    "status": true,
    "message": "{'time': '0.07212519645690918'}"
  },
  "forum": {
    "status": false,
    "message": "Expecting value: line 1 column 1 (char 0)"
  }
}
{"mode":"full","isActive":false}
  • I tested what's in the test instructions
  • I read through the code

@pomegranited

pomegranited commented Jul 26, 2021

Copy link
Copy Markdown
Contributor Author

Thanks @gabor-boros !
This is ready for your review @arbrandes .

CC @natabene

@pomegranited pomegranited mentioned this pull request Jul 26, 2021
Merged
@arbrandes

arbrandes commented Jul 26, 2021

Copy link
Copy Markdown
Contributor

@pomegranited, ACK, adding it to my list.

@arbrandes arbrandes mentioned this pull request Aug 2, 2021
Closed
@arbrandes

arbrandes commented Aug 4, 2021

Copy link
Copy Markdown
Contributor

@edx-community-bot merge

@ghost ghost added the automerge label Aug 4, 2021
@ghost
ghost merged commit b509663 into openedx:open-release/lilac.master Aug 4, 2021
@pomegranited
pomegranited deleted the lilac/feanil/arch-1821-alternative branch August 5, 2021 01:26
@openedx-webhooks openedx-webhooks added merged waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. engineering review labels Aug 16, 2021
@openedx-webhooks openedx-webhooks removed the waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. label Sep 1, 2021
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@gabor-boros gabor-boros gabor-boros approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

automerge merged open-source-contribution PR author is not from Axim or 2U

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@pomegranited @openedx-webhooks @natabene @arbrandes @gabor-boros @feanil